Usenet 1993 July

home *** CD-ROM | disk | FTP | other *** search

/ Usenet 1993 July / InfoMagic USENET CD-ROM July 1993.ISO / sources / misc / volume19 / calentool / patch01 next >

Wrap

Text File | 1991-05-16 | 33.6 KB | 1,012 lines

Newsgroups: comp.sources.misc From: Bill Randle <billr@saab.cna.tek.com> Subject: v19i081: calentool - day/week/month/year-at-a-glance Sunview tool, Patch01 Message-ID: <1991May17.031832.28241@sparky.IMD.Sterling.COM> X-Md4-Signature: bbd48f3185aa2eca3e1410015b9e3c44 Date: Fri, 17 May 1991 03:18:32 GMT Approved: kent@sparky.imd.sterling.com Submitted-by: Bill Randle <billr@saab.cna.tek.com> Posting-number: Volume 19, Issue 81 Archive-name: calentool/patch01 Patch-To: calentool: Volume 17, Issue 82-104 Here is patch 1 to the calentool 2.2 source that was posted to this newsgroup. This patch fixes several bugs that have been reported, but does not add any new features. See the file "Patches2_2" for details. Use "patch -p" to apply the diffs to preserve the directory info for the dates files. #! /bin/sh # This is a shell archive. Remove anything before this line, then unpack # it by saving it into a file and typing "sh file". To overwrite existing # files, type "sh file -c". You can also feed this as standard input via # unshar, or by typing "sh <file", e.g.. If this archive is complete, you # will see the following message at the end: # "End of shell archive." # Contents: patches01 # Wrapped by billr@saab on Mon May 13 09:38:50 1991 PATH=/bin:/usr/bin:/usr/ucb ; export PATH if test -f 'patches01' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'patches01'\" else echo shar: Extracting \"'patches01'\" $31456 characters$ sed "s/^X//" >'patches01' <<'END_OF_FILE' X*** patchlevel.h.orig Fri Feb 1 12:20:38 1991 X--- patchlevel.h Mon May 13 09:18:21 1991 X*************** X*** 1,5 **** X /* X! * $Header: patchlevel.h,v 2.8 91/02/01 12:20:37 billr Exp $ X */ X /* X * patchlevel.h - current patchlevel of the current version X--- 1,5 ---- X /* X! * $Header: patchlevel.h,v 2.9 91/05/13 09:18:20 billr Exp $ X */ X /* X * patchlevel.h - current patchlevel of the current version X*************** X*** 6,9 **** X * of the calentool program X */ X X! #define PATCHLEVEL 0 X--- 6,9 ---- X * of the calentool program X */ X X! #define PATCHLEVEL 1 X*** /dev/null Mon May 13 09:20:00 1991 X--- Patches2_2 Mon May 13 09:13:54 1991 X*************** X*** 0 **** X--- 1,40 ---- X+ # $Header: Patches2_2,v 2.0 91/05/13 09:13:44 billr Exp $ X+ X+ # Patchlevel 1 of Version 2.2 X+ =========== X+ Bugs Fixed X+ =========== X+ X+ - Incorrect dates in the dates/world file (jk@computer-science.manchester.ac.uk) X+ - Printer selections from the menu use the wrong output format (brooks@ge-dab.ge.com) X+ - Printer support off by default X+ - Use TIME_OUT from ct.h (was being overriden elsewhere) X+ - Week PS printout overlaps the times on the left edge (brooks@ge-dab.ge.com) X+ - Incorrect dates in the dates/celtic file (slocum@orion.ssdc.honeywell.COM)) X+ - Year display sometimes hangs (dougd@uts.amdahl.COM) X+ - Several typos in the man page (lms%tdjdo.tdat@suntzu.West.Sun.COM) X+ - dates/lives and dates/events not listed in DATEFILES entry in Makefile X+ (mnolan@lpl.arizona.edu) X+ - Multiple copies of appointment reminders appear when editing a day X+ page other than today (paulb@harley.tti.COM) X+ - Incorrect date for KAL 007 crash (paulb@harley.tti.COM) X+ - Crash with segmentation fault when adding an appointment to current X+ day (paulb@harley.tti.COM) X+ - Crash when typing in very long appointment entries (dougd@uts.amdahl.COM) X+ - Appointments lasting longer than the length of the day page are X+ silently truncated (brooks@sundance7.dab.ge.COM) X+ - ASCII week printout (-PW) only printed <weeklength> days when it X+ should probably always print 7 days (brooks@sundance7.dab.ge.COM) X+ X+ ==================== X+ Feature Enhancements X+ ==================== X+ X+ None. X+ X+ ========== X+ Known Bugs X+ ========== X+ X+ * Doesn't compile "out of the box" on a Sun 2 (SunOS 4.0.3) - reason X+ unknown. X*** calentool.1.orig Wed Mar 27 17:01:40 1991 X--- calentool.1 Mon May 13 09:17:51 1991 X*************** X*** 1,6 **** X! .\" $Header: calentool.1,v 2.8 91/03/27 17:01:33 billr Exp $ X .\" X! .TH CALENTOOL 1 "7 March 1991" X .ds Ps P\s-2OST\s+2S\s-2CRIPT\s+2\*R X .SH NAME X calentool - day/week/month/year-at-a-glance SunView tool (the Hacker's Almanac) X--- 1,6 ---- X! .\" $Header: calentool.1,v 2.9 91/05/13 09:17:46 billr Exp $ X .\" X! .TH CALENTOOL 1 "10 May 1991" X .ds Ps P\s-2OST\s+2S\s-2CRIPT\s+2\*R X .SH NAME X calentool - day/week/month/year-at-a-glance SunView tool (the Hacker's Almanac) X*************** X*** 207,213 **** X .B \-e X or X .B \-E X! options are used, the date format is DD/MO and DD/MO/YY. X .TP X relative dates: X +n (n days from now, for example +1 for tomorrow) X--- 207,213 ---- X .B \-e X or X .B \-E X! options are used, the date format is DD/MO and DD/MO/YY.) X .TP X relative dates: X +n (n days from now, for example +1 for tomorrow) X*************** X*** 340,346 **** X .BI \-N " int" X Set the number of noteslots displayed to X .I int X! slots. This is useful if the you increase the number of timeslots used X and want to keep the overall display size down. X .TP X .B \-o X--- 340,346 ---- X .BI \-N " int" X Set the number of noteslots displayed to X .I int X! slots. This is useful if you increase the number of timeslots used X and want to keep the overall display size down. X .TP X .B \-o X*************** X*** 377,383 **** X shows all notes, while X .B \-P X does not show notes not marked for display in the month/year displays. X! No printout is provide of the current day's appointments, if there X are none. X By default, the output generated by the -[pP] command is X in ASCII, except for month printouts where the default is \*(Ps. X--- 377,383 ---- X shows all notes, while X .B \-P X does not show notes not marked for display in the month/year displays. X! No printout is provided of the current day's appointments, if there X are none. X By default, the output generated by the -[pP] command is X in ASCII, except for month printouts where the default is \*(Ps. X*************** X*** 406,412 **** X hour (1 to 24). The end hour must be greater than the start hour. X If the start stop span is large, you should change the default font X to a smaller size font. This can be done with the X! .B \-Wi X SunView window option or by setting it explicity in the defaults file X (see below). X .TP X--- 406,412 ---- X hour (1 to 24). The end hour must be greater than the start hour. X If the start stop span is large, you should change the default font X to a smaller size font. This can be done with the X! .B \-Wt X SunView window option or by setting it explicity in the defaults file X (see below). X .TP X*************** X*** 467,473 **** X .B \-7 X Display all seven days in the week display. This is useful if the installer X has set the default value to 5 or 6 days. X! Sundat through Saturday is the standard format. Using the X .B \-e X or X .B \-E X--- 467,473 ---- X .B \-7 X Display all seven days in the week display. This is useful if the installer X has set the default value to 5 or 6 days. X! Sunday through Saturday is the standard format. Using the X .B \-e X or X .B \-E X*************** X*** 514,520 **** X lines to show all scheduled time at a glance. As the X .B More X button is toggled, the arrows change state such that the new active X! appointment has arrows drawna s solid lines and the previous appointment's X arrows (if any) are now dashed. X If appointment text is too wide for the X day page, scroll buttons appear to the right of the text and may be used to X--- 514,520 ---- X lines to show all scheduled time at a glance. As the X .B More X button is toggled, the arrows change state such that the new active X! appointment has arrows drawn as solid lines and the previous appointment's X arrows (if any) are now dashed. X If appointment text is too wide for the X day page, scroll buttons appear to the right of the text and may be used to X*************** X*** 634,644 **** X a vertical indicator arrow appears and follows the cursor. Drag the cursor X to the location of the final time slot and release the button. X The SunView L6 and L8 keys (COPY/PASTE or PUT/GET) may be also be X! used to paste the text from the shelf to an active appoinment slot X or from an appointment slot to the shelf. When inserting a string X in calentool using PASTE the slot must be active first (i.e. the X .I mouse-LB X! must have been pressed first. X .SS "Changing an appointment" X Selecting the X .I mouse-RB X--- 634,644 ---- X a vertical indicator arrow appears and follows the cursor. Drag the cursor X to the location of the final time slot and release the button. X The SunView L6 and L8 keys (COPY/PASTE or PUT/GET) may be also be X! used to paste the text from the shelf to an active appointment slot X or from an appointment slot to the shelf. When inserting a string X in calentool using PASTE the slot must be active first (i.e. the X .I mouse-LB X! must have been pressed first). X .SS "Changing an appointment" X Selecting the X .I mouse-RB X*************** X*** 937,943 **** X movies X Historical events pertaining to motion pictures X .TP X! movies X Historical events pertaining to the music world (both popular and traditional) X .TP X radio X--- 937,943 ---- X movies X Historical events pertaining to motion pictures X .TP X! music X Historical events pertaining to the music world (both popular and traditional) X .TP X radio X*** calentool.c.orig Wed Mar 27 16:45:05 1991 X--- calentool.c Mon May 13 09:17:58 1991 X*************** X*** 1,5 **** X /* X! * $Header: calentool.c,v 2.5 91/03/27 16:44:59 billr Exp $ X */ X /* X * calentool.c X--- 1,5 ---- X /* X! * $Header: calentool.c,v 2.6 91/05/13 09:17:52 billr Exp $ X */ X /* X * calentool.c X*************** X*** 762,769 **** X #endif X /* only check appointments every TIME_OUT minutes */ X timeout_cntr += update_interval; X- #undef TIME_OUT X- #define TIME_OUT 1 X if (timeout_cntr/60 < TIME_OUT) X return(NOTIFY_DONE); X timeout_cntr = 0; X--- 762,767 ---- X*** common.c.orig Wed Mar 27 16:45:11 1991 X--- common.c Mon May 13 09:18:03 1991 X*************** X*** 1,5 **** X /* X! * $Header: common.c,v 1.2 91/03/27 16:45:05 billr Exp $ X */ X /* X * common.c X--- 1,5 ---- X /* X! * $Header: common.c,v 1.3 91/05/13 09:17:59 billr Exp $ X */ X /* X * common.c X*************** X*** 110,118 **** X /* make sure it doesn't extend too far and truncate if neccessary */ X if (slotno >= n_tslots) X nappt->arrows = 0; /* force notes to have no arrows */ X! else if ((slotno + nappt->arrows) >= n_tslots) X! nappt->arrows = n_tslots - slotno - 1; /* truncate */ X! n_arrows = nappt->arrows; X if (nappt->flags & DELETED) { X /* look for matching non-deleted appt in list */ X for (optr=slots[slotno].first;optr && !found;optr=optr->next) X--- 110,119 ---- X /* make sure it doesn't extend too far and truncate if neccessary */ X if (slotno >= n_tslots) X nappt->arrows = 0; /* force notes to have no arrows */ X! if ((slotno + nappt->arrows) >= n_tslots) X! n_arrows = n_tslots - slotno - 1; /* truncate */ X! else X! n_arrows = nappt->arrows; X if (nappt->flags & DELETED) { X /* look for matching non-deleted appt in list */ X for (optr=slots[slotno].first;optr && !found;optr=optr->next) X*************** X*** 514,521 **** X struct tm save; X int runl; X X- save = current; X fix_current_day(); X /* set current to match dow of repeated appt */ X if (appt->flags & EVERY_MON_FRI) { X if (current.tm_wday == SUN) X--- 515,522 ---- X struct tm save; X int runl; X X fix_current_day(); X+ save = current; X /* set current to match dow of repeated appt */ X if (appt->flags & EVERY_MON_FRI) { X if (current.tm_wday == SUN) X*************** X*** 658,668 **** X struct appt_entry *aptr; X struct tm Saveday; X char *getenv(); X- static time_t lastmod = (time_t)0; X- struct stat stbuf; X #ifndef CALENCHECK X char msgfile[128]; X int some_appts = 0; /* no appointments today */ X static int icon_in_use = STD_ICON; X Icon cur_icon; X FILE *msgf; X--- 659,668 ---- X struct appt_entry *aptr; X struct tm Saveday; X char *getenv(); X #ifndef CALENCHECK X char msgfile[128]; X int some_appts = 0; /* no appointments today */ X+ int read_file = 0; /* reread appts file when true */ X static int icon_in_use = STD_ICON; X Icon cur_icon; X FILE *msgf; X*************** X*** 679,685 **** X X sno = echoed_sno; /* assume no console echo */ X get_today(); X- stat(apts_pathname, &stbuf); X Saveday = current; X /* X * Check to see if we're not displaying today. X--- 679,684 ---- X*************** X*** 691,697 **** X if ((int)window_get(frame, FRAME_CLOSED) && ymd_compare(closedate, today) != 0) X new_day++; X #endif X! if (ymd_compare(current, today) != 0 || new_day) { X if (day_is_open) X close_day(); X current = today; X--- 690,696 ---- X if ((int)window_get(frame, FRAME_CLOSED) && ymd_compare(closedate, today) != 0) X new_day++; X #endif X! if (ymd_compare(current, today) != 0 || new_day || !day_is_open) { X if (day_is_open) X close_day(); X current = today; X*************** X*** 698,715 **** X #ifdef CALENCHECK X new_day++; X #endif X- } X- if (stbuf.st_mtime > lastmod) { X- lastmod = stbuf.st_mtime; X- day_is_open = FALSE; /* force reading appts file */ X- sno = echoed_sno = -1; X- } X- if (day_is_open) { X- /* slot info is current */ X- #ifndef CALENCHECK X- unlock_cursors(); X- #endif X- } else { X #ifdef CALENCHECK X (void)get_day_appts(); X #else X--- 697,702 ---- X*************** X*** 718,728 **** X err2console(TRUE); X (void)get_day_appts(); X err2console(FALSE); X #endif X- day_is_open = TRUE; X read_only = save_ro; X if (new_day) X sno = echoed_sno = -1; X } X X slotno = (today.tm_hour - start_hour)*2 + today.tm_min/30; X--- 705,720 ---- X err2console(TRUE); X (void)get_day_appts(); X err2console(FALSE); X+ read_file++; X #endif X read_only = save_ro; X if (new_day) X sno = echoed_sno = -1; X+ } else { X+ /* slot info is current */ X+ #ifndef CALENCHECK X+ unlock_cursors(); X+ #endif X } X X slotno = (today.tm_hour - start_hour)*2 + today.tm_min/30; X*************** X*** 856,861 **** X--- 848,854 ---- X if (new_day && (int)window_get(frame, FRAME_CLOSED)) { X /* update times so that it opens on today */ X closedate = olddate = Saveday = today; X+ read_file++; X /* update date field of the icons */ X sprintf(datestr_day, "%d", today.tm_mday); X /* replace the date */ X*************** X*** 899,908 **** X } X #endif X #ifndef CALENCHECK X! current = Saveday; X! err2console(TRUE); X! (void)get_day_appts(); X! err2console(FALSE); X if (locked == 2) X unlock_cursors(); X #endif X--- 892,904 ---- X } X #endif X #ifndef CALENCHECK X! if (read_file) { X! current = Saveday; X! err2console(TRUE); X! (void)get_day_appts(); X! err2console(FALSE); X! day_is_open = TRUE; X! } X if (locked == 2) X unlock_cursors(); X #endif X*** ct.h.orig Mon May 13 09:20:54 1991 X--- ct.h Mon May 13 09:18:06 1991 X*************** X*** 1,5 **** X /* X! * $Header: ct.h,v 2.5 91/03/27 16:45:12 billr Exp $ X */ X /* X * ct.h - header file for calentool X--- 1,5 ---- X /* X! * $Header: ct.h,v 2.6 91/05/13 09:18:04 billr Exp $ X */ X /* X * ct.h - header file for calentool X*************** X*** 27,33 **** X * define some or all of these here or in the Makefile. Combined, X * they save ~100K bytes for a statically linked object. X */ X! #define NO_PRINTER /* exclude printer support code */ X /*#define NO_HOLIDAYS /* exclude holiday checking code */ X /*#define NO_SUN_MOON /* exclude Sun/Moon data frames */ X X--- 27,33 ---- X * define some or all of these here or in the Makefile. Combined, X * they save ~100K bytes for a statically linked object. X */ X! /*#define NO_PRINTER /* exclude printer support code */ X /*#define NO_HOLIDAYS /* exclude holiday checking code */ X /*#define NO_SUN_MOON /* exclude Sun/Moon data frames */ X X*** devent.c.orig Wed Mar 27 16:45:28 1991 X--- devent.c Mon May 13 09:18:12 1991 X*************** X*** 1,5 **** X /* X! * $Header: devent.c,v 2.8 91/03/27 16:45:23 billr Exp $ X */ X /* X * devent.c X--- 1,5 ---- X /* X! * $Header: devent.c,v 2.9 91/05/13 09:18:07 billr Exp $ X */ X /* X * devent.c X*************** X*** 125,131 **** X /* in a different slot than we were before */ X if (slots[box_index].active) X /* display cursor at new location */ X! text_cursor(box_index); X } X if (found_flag == FOUND_SLOT && event_id(event) == KEY_LEFT(8) X && event_is_up(event)) { X--- 125,131 ---- X /* in a different slot than we were before */ X if (slots[box_index].active) X /* display cursor at new location */ X! text_cursor(box_index); X } X if (found_flag == FOUND_SLOT && event_id(event) == KEY_LEFT(8) X && event_is_up(event)) { X*************** X*** 441,446 **** X--- 441,448 ---- X { X int strl, x; X X+ if (slots[slotno].cur_appt == NULL) X+ return; X strl = strlen(&slots[slotno].cur_appt->str[slots[slotno].cur_appt->sindex]); X if (strl <= (day_message_size-1)) { X x = slots[slotno].slot_pos.left + strl * font->pf_defaultsize.x; X*** notify.c.orig Wed Mar 27 16:46:08 1991 X--- notify.c Mon May 13 09:18:19 1991 X*************** X*** 1,5 **** X /* X! * $Header: notify.c,v 2.4 91/03/27 16:46:01 billr Exp $ X */ X /* X * notify.c X--- 1,5 ---- X /* X! * $Header: notify.c,v 2.5 91/05/13 09:18:13 billr Exp $ X */ X /* X * notify.c X*************** X*** 1416,1422 **** X #endif X value = (int) menu_show(print_menu, panel, event, 0); X if (value > 0) { X! panel_set(item, PANEL_CLIENT_DATA, value, 0); X if (value == 3) { X /* change printer */ X panel_set_value(prfile_pi, print_to_file); X--- 1416,1422 ---- X #endif X value = (int) menu_show(print_menu, panel, event, 0); X if (value > 0) { X! panel_set(item, PANEL_CLIENT_DATA, value+1, 0); X if (value == 3) { X /* change printer */ X panel_set_value(prfile_pi, print_to_file); X*** pcaldw.c.orig Wed Mar 27 16:46:20 1991 X--- pcaldw.c Mon May 13 09:18:23 1991 X*************** X*** 1,5 **** X /* X! * $Header: pcaldw.c,v 1.2 91/03/27 16:46:17 billr Exp $ X */ X /* X * pcaldw - print pretty PostScript image of a day or week calendar X--- 1,5 ---- X /* X! * $Header: pcaldw.c,v 1.3 91/05/13 09:18:22 billr Exp $ X */ X /* X * pcaldw - print pretty PostScript image of a day or week calendar X*************** X*** 244,250 **** X "{", X " 90 rotate", X " 40 -50 translate", X! " /offset -405 def", X " /xscale 8.75 nweekd div 5.625 div def", X " dayfont findfont 10 scalefont setfont", X " gsave", X--- 244,250 ---- X "{", X " 90 rotate", X " 40 -50 translate", X! " /offset -380 def", X " /xscale 8.75 nweekd div 5.625 div def", X " dayfont findfont 10 scalefont setfont", X " gsave", X*** printer.c.orig Wed Mar 27 16:46:21 1991 X--- printer.c Mon May 13 09:18:26 1991 X*************** X*** 1,5 **** X /* X! * $Header: printer.c,v 1.1 91/03/27 16:46:20 billr Exp $ X */ X /* X * printer.c X--- 1,5 ---- X /* X! * $Header: printer.c,v 1.2 91/05/13 09:18:24 billr Exp $ X */ X /* X * printer.c X*************** X*** 228,234 **** X print_apts(which, dest) X int which, dest; X { X! int i, gd_rtn, target; X FILE *output, *pfp, *popen(); X char cmd[80], *name, *cuserid(), *mail_subj(); X struct tm Save; X--- 228,234 ---- X print_apts(which, dest) X int which, dest; X { X! int i, gd_rtn, target, ndays; X FILE *output, *pfp, *popen(); X char cmd[80], *name, *cuserid(), *mail_subj(); X struct tm Save; X*************** X*** 277,282 **** X--- 277,285 ---- X /* looking at Sun */ X current.tm_mday++; X fix_current_day(); X+ ndays = nr_weekdays; X+ } else { X+ ndays = 7; X } X if (print_dev == PR_POSTSCRIPT) X #ifdef RASTER_ONLY X*************** X*** 285,291 **** X print_psweek(output, (which == PRI_WEEK_XNOTES ? TRUE : FALSE)); X #endif X else X! for (i=0;i<nr_weekdays;i++) { X gd_rtn = get_day_appts(); X if ((gd_rtn && which == PRI_WEEK) || X (gd_rtn & ~SOME_MKNOTES && which == PRI_WEEK_XNOTES)) X--- 288,294 ---- X print_psweek(output, (which == PRI_WEEK_XNOTES ? TRUE : FALSE)); X #endif X else X! for (i=0;i<ndays;i++) { X gd_rtn = get_day_appts(); X if ((gd_rtn && which == PRI_WEEK) || X (gd_rtn & ~SOME_MKNOTES && which == PRI_WEEK_XNOTES)) X*** version.c.orig Wed Mar 27 17:14:59 1991 X--- version.c Mon May 13 09:18:28 1991 X*************** X*** 1,5 **** X /* X! * $Header: version.c,v 2.10 91/03/27 17:14:50 billr Exp $ X */ X /* X * version.c - current version of calentool program X--- 1,5 ---- X /* X! * $Header: version.c,v 2.11 91/05/13 09:18:27 billr Exp $ X */ X /* X * version.c - current version of calentool program X*************** X*** 30,38 **** X X static char vers[64]; X static char vers_name[] = "Calendar Tool V2.2"; X! static char vers_date[] = " [3/26/91]"; X #ifdef TEST X! static char vers_test[] = "delta"; X #endif X X char * X--- 30,38 ---- X X static char vers[64]; X static char vers_name[] = "Calendar Tool V2.2"; X! static char vers_date[] = " [5/10/91]"; X #ifdef TEST X! static char vers_test[] = "epsilon"; X #endif X X char * X*** ypaint.c.orig Wed Mar 27 16:46:53 1991 X--- ypaint.c Mon May 13 09:18:30 1991 X*************** X*** 1,5 **** X /* X! * $Header: ypaint.c,v 2.5 91/03/27 16:46:51 billr Exp $ X */ X /* X * ypaint.c X--- 1,5 ---- X /* X! * $Header: ypaint.c,v 2.6 91/05/13 09:18:29 billr Exp $ X */ X /* X * ypaint.c X*************** X*** 66,72 **** X print_button(TRUE); X X /* Which days have appointments? */ X! for (i=1; i<=dysize(current.tm_year + 1900); i++) X busy_today[i] = 0; X Save = current; X current.tm_mon = JAN; X--- 66,72 ---- X print_button(TRUE); X X /* Which days have appointments? */ X! for (i=0; i<dysize(current.tm_year + 1900); i++) X busy_today[i] = 0; X Save = current; X current.tm_mon = JAN; X*************** X*** 177,188 **** X else X busy_today[current.tm_yday]++; X } X! } else if ((appt.flags & REPEAT) || (appt.flags & EVERY_SOMEDAY)) { X /* find 1st appt in this year */ X! if (appt.flags & RUN) X! runl = appt.runlength; X! else X! runl = 1; X if (appt.flags & EVERY_SOMEDAY) X find_date(&appt); X while (ymd_compare(current, First) < 0 && runl) { X--- 177,185 ---- X else X busy_today[current.tm_yday]++; X } X! } else if (appt.flags & RUN) { X /* find 1st appt in this year */ X! runl = appt.runlength; X if (appt.flags & EVERY_SOMEDAY) X find_date(&appt); X while (ymd_compare(current, First) < 0 && runl) { X*** Makefile.orig Wed Mar 27 17:01:29 1991 X--- Makefile Mon May 13 09:18:33 1991 X*************** X*** 1,4 **** X! # $Header: Makefile,v 2.7 91/03/27 17:01:26 billr Exp $ X # X #C DEFINES (make macro DEFINES): X # (These can all be set in ct.h also) X--- 1,4 ---- X! # $Header: Makefile,v 2.8 91/05/13 09:18:31 billr Exp $ X # X #C DEFINES (make macro DEFINES): X # (These can all be set in ct.h also) X*************** X*** 89,95 **** X dates/lives3 dates/lives4 dates/lives5 dates/lives6 dates/lotr\ X dates/movies dates/music dates/radio dates/sfo dates/space\ X dates/sports dates/television dates/usa_holiday dates/usa_other\ X! dates/usa_states dates/witchcraft dates/world X SRCS= calentool.c common.c datelib.o devent.c dpaint.c event.c\ X expire.c holidays.c init.c moon.c mpaint.c notify.c pcal.c\ X pcaldw.c printer.c ras2ps.c riseset.c tool.c utils.c\ X--- 89,96 ---- X dates/lives3 dates/lives4 dates/lives5 dates/lives6 dates/lotr\ X dates/movies dates/music dates/radio dates/sfo dates/space\ X dates/sports dates/television dates/usa_holiday dates/usa_other\ X! dates/usa_states dates/witchcraft dates/world\ X! dates/events dates/lives X SRCS= calentool.c common.c datelib.o devent.c dpaint.c event.c\ X expire.c holidays.c init.c moon.c mpaint.c notify.c pcal.c\ X pcaldw.c printer.c ras2ps.c riseset.c tool.c utils.c\ X*** dates/space.orig Thu Mar 7 16:21:31 1991 X--- dates/space Mon May 13 09:36:56 1991 X*************** X*** 1,5 **** X # CalenTool V2.2 - nflag=1 range=1,12 - DO NOT REMOVE THIS LINE X! # $Header: space,v 2.4 91/03/07 16:21:27 billr Exp $ X # Dates related to events in aviation, astronomy and space exploration X # Today in History dates provided by Robert Heckendorn at X # Hewlett-Packard in Fort Collins, Colorado. X--- 1,5 ---- X # CalenTool V2.2 - nflag=1 range=1,12 - DO NOT REMOVE THIS LINE X! # $Header: space,v 2.5 91/05/13 09:36:51 billr Exp $ X # Dates related to events in aviation, astronomy and space exploration X # Today in History dates provided by Robert Heckendorn at X # Hewlett-Packard in Fort Collins, Colorado. X*************** X*** 126,132 **** X ** 04 19 99 99 00 USSR Salyut 7 space station put into orbit (1982) X ** 04 20 99 99 00 American Harold Graham makes first rocket belt flight (1961) X ** 04 20 99 99 00 Canadian ANIK A2 became first commercial satellite in orbit (1973) X- ** 04 20 99 99 00 Korean Airlines flight 707 is forced to crash land in the Soviet Union after begin fired on by a Soviet interceptor (1978) X ** 04 20 99 99 00 Soyuz T-8 launched; mission aborted when capsule fails to dock with Salyut station (1983) X ** 04 20 99 99 00 The manned lunar module of Apollo 16 landed on the moon (1972) X ** 04 21 99 99 00 Apollo 16 Astronauts John W. Young and Charles M. Duke explore the moon's surface (1972) X--- 126,131 ---- X*************** X*** 313,318 **** X--- 312,318 ---- X ** 08 30 99 99 00 Maiden Voyage of Discovery carrying first non-astronaut Charlie Walker (1984) X ** 08 31 99 99 00 269 people killed after Korean Airlines 747 shot down by USSR (1983) X ** 09 01 99 99 00 Pioneer 11, first craft to fly by Saturn (1979) X+ ** 09 01 99 99 00 Korean Airlines flight 007 is forced to crash land in the Soviet Union after begin fired on by a Soviet interceptor (1983) X ** 09 02 99 99 00 The asteroid Juno discovered (1804) X ** 09 03 99 99 00 Viking II lander sets down on Mars (1976) X ** 09 04 99 99 00 NASA launches its first Orbital Geophysical Observatory (OGO-1) (1964) X*** dates/usa_other.orig Thu Mar 7 16:21:38 1991 X--- dates/usa_other Mon May 13 09:36:58 1991 X*************** X*** 1,5 **** X # CalenTool V2.2 - nflag=1 range=1,12 - DO NOT REMOVE THIS LINE X! # $Header: usa_other,v 2.3 91/03/07 16:21:37 billr Exp $ X # Special days file for calentool (rel 2.1); modified from network posting by X # RPC Rodgers, UCSF, Nov. 1988 X # Misc US and Canadian holidays fixed by exact date or as nth mday of month X--- 1,5 ---- X # CalenTool V2.2 - nflag=1 range=1,12 - DO NOT REMOVE THIS LINE X! # $Header: usa_other,v 2.4 91/05/13 09:36:57 billr Exp $ X # Special days file for calentool (rel 2.1); modified from network posting by X # RPC Rodgers, UCSF, Nov. 1988 X # Misc US and Canadian holidays fixed by exact date or as nth mday of month X*************** X*** 37,43 **** X ** 04 15 99 99 00 Federal Income Tax is Due X ** 04 19 99 99 00 Patriot's Day X ** 04 22 99 99 00 Earth Day X! ** 04 23 99 99 00 National Secretary Day X ** 04 Fr 99 99 00 [L] Arbor Day X ** 04 Su 99 99 00 [1] <4> Daylight Savings Time Begins (set clocks forward 1 h) X ** 05 01 99 99 00 Law Day (declared by Eisenhower) X--- 37,43 ---- X ** 04 15 99 99 00 Federal Income Tax is Due X ** 04 19 99 99 00 Patriot's Day X ** 04 22 99 99 00 Earth Day X! ** 04 We 99 99 00 [4] National Secretary Day X ** 04 Fr 99 99 00 [L] Arbor Day X ** 04 Su 99 99 00 [1] <4> Daylight Savings Time Begins (set clocks forward 1 h) X ** 05 01 99 99 00 Law Day (declared by Eisenhower) X*** dates/world.orig Thu Mar 7 16:21:46 1991 X--- dates/world Mon May 13 09:37:02 1991 X*************** X*** 1,5 **** X # CalenTool V2.2 - nflag=1 range=1,12 - DO NOT REMOVE THIS LINE X! # $Header: world,v 2.6 91/03/07 16:21:42 billr Exp $ X # Special days file for calentool (rel 2.1); modified from network posting by X # RPC Rodgers, UCSF, Nov. 1988 X # Various holidays and special days commemorated around the world X--- 1,5 ---- X # CalenTool V2.2 - nflag=1 range=1,12 - DO NOT REMOVE THIS LINE X! # $Header: world,v 2.7 91/05/13 09:36:58 billr Exp $ X # Special days file for calentool (rel 2.1); modified from network posting by X # RPC Rodgers, UCSF, Nov. 1988 X # Various holidays and special days commemorated around the world X*************** X*** 101,107 **** X ** 03 27 99 99 00 Armed Forces Day (Burma) X ** 03 29 99 99 00 Memorial Day (Madagascar) X ** 03 31 99 99 00 National Day (Malta) X! ** 04 01 99 99 00 Beginning of the financial year (Britan) X ** 04 01 99 99 00 Youth Day (Benin) X ** 04 02 99 99 00 Malvinas Day (Argentina) X ** 04 03 99 99 00 Jimmu Tenno Sai, Demise of the First Emperor (Japan) X--- 101,107 ---- X ** 03 27 99 99 00 Armed Forces Day (Burma) X ** 03 29 99 99 00 Memorial Day (Madagascar) X ** 03 31 99 99 00 National Day (Malta) X! ** 04 01 99 99 00 Beginning of the financial year (Britain) X ** 04 01 99 99 00 Youth Day (Benin) X ** 04 02 99 99 00 Malvinas Day (Argentina) X ** 04 03 99 99 00 Jimmu Tenno Sai, Demise of the First Emperor (Japan) X*************** X*** 145,150 **** X--- 145,151 ---- X ** 04 30 99 99 00 Sho Konsai, Commemoration for the Departed (Japan) X ** 04 30 99 99 00 Queen's Birthday (Netherlands, Netherlands Antilles) X ** 04 30 99 99 00 The Workers Day (Uruguay) X+ ** 05 Mo 99 99 00 [1] Bank Holiday (UK) X ** 05 01 99 99 00 Labor Day (many places) X ** 05 01 99 00 00 Tag der Arbeit (Germany) X ** 05 02 99 99 00 Constitution Day (Japan) X*************** X*** 156,162 **** X ** 05 05 99 99 00 Coronation Day (Thailand) X ** 05 05 99 99 00 Independence Day/Battle of Puebla (Mexico) X ** 05 05 99 99 00 Liberation Day (Netherlands) X- ** 05 06 99 99 00 Bank Holiday (UK) X ** 05 06 99 99 00 Bataan Day (Philippines) X ** 05 08 99 99 00 Buddha's Birthday (South Korea) X ** 05 08 99 99 00 Elections for National Assembly (Philippines) X--- 157,162 ---- X*************** X*** 191,197 **** X ** 05 25 99 99 00 Independence Day (Jordan) X ** 05 25 99 99 00 Revolution in Sudan (Libyan Arab Republic) X ** 05 27 99 99 00 Kaigun Kinenbi, Navy Commemoration Day (Japan) X- ** 05 27 99 99 00 Bank Holiday (UK) X ** 05 28 99 99 00 Mothers Day (Central African Republic) X ** 05 31 99 99 00 Pya Martyrs Day (Togo) X ** 05 31 99 99 00 Republic Day (South Africa) X--- 191,196 ---- X*************** X*** 309,315 **** X ** 08 03 99 99 00 Massacre du Pidjiguiti (Guinea-Bissau) X ** 08 03 99 99 00 Memorial Day of Archbishop Makarios (Cyprus) X ** 08 04 99 99 00 Freedom Day (Guyana) X! ** 08 05 99 99 00 Bank Holiday (Scotland, Northern Ireland) X ** 08 06 99 99 00 Bank Holiday (Australia, Fiji, Iceland) X ** 08 06 99 99 00 Caricom (Barbados) X ** 08 06 99 99 00 Emancipation Day (Bahamas) X--- 308,314 ---- X ** 08 03 99 99 00 Massacre du Pidjiguiti (Guinea-Bissau) X ** 08 03 99 99 00 Memorial Day of Archbishop Makarios (Cyprus) X ** 08 04 99 99 00 Freedom Day (Guyana) X! ** 08 Mo 99 99 00 [1] Bank Holiday (Scotland, Northern Ireland) X ** 08 06 99 99 00 Bank Holiday (Australia, Fiji, Iceland) X ** 08 06 99 99 00 Caricom (Barbados) X ** 08 06 99 99 00 Emancipation Day (Bahamas) X*************** X*** 340,346 **** X ** 08 24 99 99 00 National Flag Day (Liberia) X ** 08 25 99 99 00 Constitution Day (Paragual) X ** 08 25 99 99 00 Independence Day (Uruguay) X! ** 08 26 99 99 00 Bank Holiday (England, Wales) X ** 08 27 99 99 00 Liberation Day (Hong Kong) X ** 08 28 99 99 00 Heroes Day (Philippines) X ** 08 30 99 99 00 St. Rose of Lima (Peru) X--- 339,345 ---- X ** 08 24 99 99 00 National Flag Day (Liberia) X ** 08 25 99 99 00 Constitution Day (Paragual) X ** 08 25 99 99 00 Independence Day (Uruguay) X! ** 08 Mo 99 99 00 [L] Bank Holiday (England, Wales) X ** 08 27 99 99 00 Liberation Day (Hong Kong) X ** 08 28 99 99 00 Heroes Day (Philippines) X ** 08 30 99 99 00 St. Rose of Lima (Peru) X*** dates/celtic.orig Thu Mar 7 16:21:05 1991 X--- dates/celtic Mon May 13 09:38:26 1991 X*************** X*** 1,10 **** X # CalenTool V2.2 - nflag=1 range=2,11 - DO NOT REMOVE THIS LINE X! # $Header: celtic,v 2.3 91/03/07 16:21:04 billr Exp $ X # Special days file for calentool (rel 2.1); modified from network posting by X # RPC Rodgers, UCSF, Nov. 1988 X # Dates of interest to Celts X # X! ** 02 01 99 99 00 Oimelc (Winter purification & approach of spring) X ** 05 01 99 99 00 Beltaine (Feast of sun god Bel) X! ** 08 01 99 99 00 Lughnasa (Feast of god Lugh, 30 day Celtic feast centers on this day) X! ** 11 01 99 99 00 Samhain (beginning of Celtic year, most important holiday) X--- 1,10 ---- X # CalenTool V2.2 - nflag=1 range=2,11 - DO NOT REMOVE THIS LINE X! # $Header: celtic,v 2.4 91/05/13 09:38:16 billr Exp $ X # Special days file for calentool (rel 2.1); modified from network posting by X # RPC Rodgers, UCSF, Nov. 1988 X # Dates of interest to Celts X # X! ** 02 02 99 99 00 Oimelc (Winter purification & approach of spring) X ** 05 01 99 99 00 Beltaine (Feast of sun god Bel) X! ** 08 02 99 99 00 Lughnasa (Feast of god Lugh, 30 day Celtic feast centers on this day) X! ** 10 31 99 99 00 Samhain (beginning of Celtic year, most important holiday) END_OF_FILE if test 31456 -ne `wc -c <'patches01'`; then echo shar: \"'patches01'\" unpacked with wrong size! fi # end of 'patches01' fi echo shar: End of shell archive. exit 0 exit 0 # Just in case... -- Kent Landfield INTERNET: kent@sparky.IMD.Sterling.COM Sterling Software, IMD UUCP: uunet!sparky!kent Phone: (402) 291-8300 FAX: (402) 291-4362 Please send comp.sources.misc-related mail to kent@uunet.uu.net.